Skip to content

Conversation

@ponsfrilus
Copy link
Contributor

@ponsfrilus ponsfrilus commented Aug 21, 2017

A better PR (no conflict) to fix image and close #73

@ponsfrilus ponsfrilus mentioned this pull request Aug 21, 2017
img/regexp.svg Outdated
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="regexp.svg"
<<<<<<< HEAD
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ponsfrilus Could you please remove these conflict markers. :)

@ziishaned
Copy link
Owner

@ponsfrilus In regexp.svg you just forgot to remove the conflict markers could you please remove them.

@ziishaned ziishaned merged commit 4726270 into ziishaned:master Aug 21, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants